From eed32b0cbd0245f6269a4aa4cdc75470ef35f3ae Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 1 Apr 2009 11:47:59 +0100 Subject: [PATCH] xend: modify a warning log message Signed-off-by: Kouya Shimura --- tools/python/xen/xend/image.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index c058cecb9e..1f2eb4a9f5 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -534,8 +534,8 @@ class ImageHandler: try: self.sentinel_fifo.read(1) except OSError, e: pass self.sentinel_lock.acquire() - try: - if self.pid: + if self.pid: + try: (p,st) = os.waitpid(self.pid, os.WNOHANG) if p == self.pid: message = oshelp.waitstatus_description(st) @@ -547,15 +547,15 @@ class ImageHandler: except: message = "malfunctioning or died ?" message = "pid %d: %s" % (self.pid, message) - else: - message = "no longer running" - except Exception, e: - message = "waitpid failed: %s" % utils.exception_string(e) - message = "device model failure: %s" % message - try: message += "; see %s " % self.logfile - except: pass - self._dmfailed(message) - self.pid = None + except Exception, e: + message = "waitpid failed: %s" % utils.exception_string(e) + message = "device model failure: %s" % message + try: message += "; see %s " % self.logfile + except: pass + self._dmfailed(message) + self.pid = None + else: + log.info("%s device model terminated", self.vm.getName()) self.sentinel_lock.release() def destroyDeviceModel(self): -- 2.30.2